merge trunk
authorKenichi Handa <handa@m17n.org>
Fri, 21 Oct 2011 06:45:30 +0000 (15:45 +0900)
committerKenichi Handa <handa@m17n.org>
Fri, 21 Oct 2011 06:45:30 +0000 (15:45 +0900)

Trivial merge